Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 5 Apr 2007 17:12:35 +0000 (18:12 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 5 Apr 2007 17:12:35 +0000 (18:12 +0100)

Trivial merge